Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace update in setupmaster.go #41123

Merged
merged 1 commit into from
Feb 10, 2017
Merged

replace update in setupmaster.go #41123

merged 1 commit into from
Feb 10, 2017

Conversation

xilabao
Copy link
Contributor

@xilabao xilabao commented Feb 8, 2017 •
edited

follow the TODO

@k8s-ci-robot
Copy link
Contributor

Hi @xilabao. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 8, 2017
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Feb 8, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@luxas luxas assigned luxas and deads2k and unassigned pires Feb 8, 2017
@luxas luxas added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Feb 8, 2017
@luxas
Copy link
Member

luxas commented Feb 8, 2017

@xilabao Thanks for this contribution!! This is great!

cc @deads2k

@k8s-bot ok to test

deads2k
deads2k reviewed Feb 8, 2017
View reviewed changes
cmd/kubeadm/app/phases/apiconfig/setupmaster.go Outdated
// TODO: Use a patch instead of an Update
if _, err := client.Nodes().Update(n); err != nil {
// TODO: Switch to the new master label defined in https://github.com/kubernetes/kubernetes/pull/39112
addAnnotationPatch := fmt.Sprintf(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't recommend building a patch by hand. As I recall there are functions that take two objects and compute the diff.

@xilabao xilabao force-pushed the replace-update-to-patch-in-setupmaster branch 2 times, most recently from 202c9fe to efa6afd Compare February 9, 2017 01:41
@k8s-ci-robot
Copy link
Contributor

@xilabao: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins Bazel Build 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot bazel test this
Jenkins GCE e2e 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot cvm gce e2e test this
Jenkins GKE smoke e2e 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot cvm gke e2e test this
Jenkins CRI GCE Node e2e 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot cri node e2e test this
Jenkins GCI GCE e2e 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot gci gce e2e test this
Jenkins GCI GKE smoke e2e 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot gci gke e2e test this
Jenkins verification 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot verify test this
Jenkins kops AWS e2e 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot kops aws e2e test this
Jenkins Kubemark GCE e2e 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot kubemark e2e test this
Jenkins GCE Node e2e 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot node e2e test this
Jenkins unit/integration 202c9fe897f23dead6ac5de018ff66b8e98d7728 link @k8s-bot unit test this
Jenkins GCE etcd3 e2e efa6afd link @k8s-bot gce etcd3 e2e test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@xilabao
Copy link
Contributor Author

xilabao commented Feb 9, 2017

@k8s-bot gce etcd3 e2e test this

@xilabao
Copy link
Contributor Author

xilabao commented Feb 9, 2017

@deads2k @luxas PTAL

@pires
Copy link
Contributor

pires commented Feb 9, 2017

/lgtm

@k8s-ci-robot
Copy link
Contributor

@pires: you can't LGTM a PR unless you are an assignee.

In response to this comment:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@pires
Copy link
Contributor

pires commented Feb 9, 2017

ah, I was assigned but then removed :/

@luxas
Copy link
Member

luxas commented Feb 9, 2017

@pires Ah, yeah, sorry. Discussed this on Slack yesterday, where you said you had the rest of the week full.

Anyway, this lgtm as well
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 9, 2017
@luxas
Copy link
Member

luxas commented Feb 9, 2017

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: luxas, xilabao

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 9, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 40917, 41181, 41123, 36592, 41183)

@k8s-github-robot k8s-github-robot merged commit 89ca179 into kubernetes:master Feb 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k deads2k left review comments

Assignees

@luxas luxas

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@xilabao @k8s-ci-robot @k8s-reviewable @luxas @pires @k8s-github-robot @deads2k